merge trunk
authorKenichi Handa <handa@m17n.org>
Thu, 6 May 2010 15:30:24 +0000 (00:30 +0900)
committerKenichi Handa <handa@m17n.org>
Thu, 6 May 2010 15:30:24 +0000 (00:30 +0900)

Trivial merge